Skip to content

fix(patch): cherry-pick bd53951 to release/v0.44.0-pr-27496 [CONFLICTS]#27534

Merged
scidomino merged 2 commits into
release/v0.44.0-pr-27496from
hotfix/v0.44.0/0.44.1/stable/cherry-pick-bd53951/pr-27496
May 28, 2026
Merged

fix(patch): cherry-pick bd53951 to release/v0.44.0-pr-27496 [CONFLICTS]#27534
scidomino merged 2 commits into
release/v0.44.0-pr-27496from
hotfix/v0.44.0/0.44.1/stable/cherry-pick-bd53951/pr-27496

Conversation

@gemini-cli-robot

@gemini-cli-robot gemini-cli-robot commented May 28, 2026

Copy link
Copy Markdown
Collaborator

This PR automatically cherry-picks commit bd53951 to patch version v0.44.0 in the stable release to create version 0.44.1.

⚠️ Merge Conflicts Detected

This cherry-pick resulted in merge conflicts that need manual resolution.

🔧 Next Steps:

  1. Review the conflicts: Check out this branch and review the conflict markers
  2. Resolve conflicts: Edit the affected files to resolve the conflicts
  3. Test the changes: Ensure the patch works correctly after resolution
  4. Update this PR: Push your conflict resolution

📋 Files with conflicts:

The commit has been created with conflict markers for easier manual resolution.

🚨 Important:

  • Do not merge this PR until conflicts are resolved
  • The automated patch release will trigger once this PR is merged

@scidomino @gemini-cli-robot
fix(core): harden PTY resize against native crashes (#27496)
7496e22 
# Conflicts:
#	packages/cli/index.ts
#	packages/core/src/services/shellExecutionService.ts
@gemini-cli-robot gemini-cli-robot requested a review from a team as a code owner May 28, 2026 16:25
@github-actions github-actions Bot mentioned this pull request May 28, 2026
Merged
6 tasks
@gemini-code-assist

gemini-code-assist Bot commented May 28, 2026

Copy link
Copy Markdown
Contributor

Summary of Changes

Hello, I'm Gemini Code Assist1! I'm currently reviewing this pull request and will post my feedback shortly. In the meantime, here's a summary to help you and other reviewers quickly get up to speed!

This pull request aims to backport a fix for PTY resize-related native crashes to the v0.44.x release branch. The changes introduce more robust error checking and process validation when resizing terminal sessions to handle race conditions more gracefully. Please note that this PR currently contains unresolved merge conflicts that must be addressed before it can be merged.

Highlights

  • PTY Resize Hardening: Implemented additional error handling and validation during PTY resize operations to prevent native crashes caused by race conditions.
  • Conflict Resolution: This PR contains merge conflicts from an automated cherry-pick of commit bd53951. Manual intervention is required to resolve these conflicts in the PTY resize logic.
Using Gemini Code Assist

The full guide for Gemini Code Assist can be found on our documentation page, here are some quick tips.

Invoking Gemini

You can request assistance from Gemini at any point by creating a comment using either /gemini <command> or @gemini-code-assist <command>. Below is a summary of the supported commands on the current page.

Feature Command Description
Code Review /gemini review Performs a code review for the current pull request in its current state.
Pull Request Summary /gemini summary Provides a summary of the current pull request in its current state.
Comment @gemini-code-assist Responds in comments when explicitly tagged, both in pull request comments and review comments.
Help /gemini help Displays a list of available commands.

Customization

To customize the Gemini Code Assist for GitHub experience, repository maintainers can create a configuration file and/or provide a custom code review style guide (such as PEP-8 for Python) by creating and adding files to a .gemini/ folder in the base of the repository. Detailed instructions can be found here.

Limitations & Feedback

Gemini Code Assist may make mistakes. Please leave feedback on any instances where its feedback is incorrect or counterproductive. You can react with 👍 and 👎 on @gemini-code-assist comments. If you're interested in giving your feedback about your experience with Gemini Code Assist for GitHub and other Google products, sign up here.

Footnotes

  1. Review the Privacy Notices, Generative AI Prohibited Use Policy, Terms of Service, and learn how to configure Gemini Code Assist in GitHub here. Gemini can make mistakes, so double check it and use code with caution. ↩

gemini-code-assist[bot]
gemini-code-assist Bot reviewed May 28, 2026
View reviewed changes

@gemini-code-assist gemini-code-assist Bot left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Code Review

This pull request aims to harden PTY resizing against native crashes by catching and ignoring specific errors (such as EBADF, ESRCH, and Windows-specific exit errors) during resize operations in packages/cli and packages/core. However, the changes currently contain unresolved Git merge conflict markers in both modified files. There are no review comments to evaluate, so no feedback on comments is provided.

@scidomino scidomino enabled auto-merge (squash) May 28, 2026 16:35
@github-actions

github-actions Bot commented May 28, 2026

Copy link
Copy Markdown

Size Change: +551 B (0%)

Total Size: 33.9 MB

Filename Size Change
./bundle/chunk-2TDWLATN.js 0 B -49.2 kB (removed) 🏆
./bundle/chunk-4N3K2XMZ.js 0 B -16.4 MB (removed) 🏆
./bundle/chunk-AWTHGY2N.js 0 B -13 kB (removed) 🏆
./bundle/chunk-HQZDMKTA.js 0 B -659 kB (removed) 🏆
./bundle/chunk-JS3AHHYQ.js 0 B -3.43 kB (removed) 🏆
./bundle/chunk-LIMA6DEZ.js 0 B -2.79 MB (removed) 🏆
./bundle/chunk-PJ5VPI4G.js 0 B -19.5 kB (removed) 🏆
./bundle/chunk-RE5WQBJI.js 0 B -3.77 kB (removed) 🏆
./bundle/core-XE7HUBZF.js 0 B -49.6 kB (removed) 🏆
./bundle/devtoolsService-BENQRTIM.js 0 B -28 kB (removed) 🏆
./bundle/gemini-4FCLWMML.js 0 B -589 kB (removed) 🏆
./bundle/interactiveCli-SO5PZZL5.js 0 B -1.3 MB (removed) 🏆
./bundle/liteRtServerManager-5XWA7FLL.js 0 B -2.08 kB (removed) 🏆
./bundle/oauth2-provider-IWWSBQ5Z.js 0 B -9.12 kB (removed) 🏆
./bundle/chunk-23IJQAIO.js 3.77 kB +3.77 kB (new file) 🆕
./bundle/chunk-AY7RFYGP.js 19.5 kB +19.5 kB (new file) 🆕
./bundle/chunk-GOZPYVLL.js 16.4 MB +16.4 MB (new file) 🆕
./bundle/chunk-PQQEJO43.js 49.2 kB +49.2 kB (new file) 🆕
./bundle/chunk-PTYR2JUC.js 2.79 MB +2.79 MB (new file) 🆕
./bundle/chunk-PZJUPOUJ.js 3.43 kB +3.43 kB (new file) 🆕
./bundle/chunk-RRI6QRXX.js 659 kB +659 kB (new file) 🆕
./bundle/chunk-XQ5LUB3H.js 13 kB +13 kB (new file) 🆕
./bundle/core-SEM5E6IU.js 49.6 kB +49.6 kB (new file) 🆕
./bundle/devtoolsService-MQQUNYDG.js 28 kB +28 kB (new file) 🆕
./bundle/gemini-REXLUKUT.js 589 kB +589 kB (new file) 🆕
./bundle/interactiveCli-TQQLBA3Q.js 1.3 MB +1.3 MB (new file) 🆕
./bundle/liteRtServerManager-7ZJPTAHG.js 2.08 kB +2.08 kB (new file) 🆕
./bundle/oauth2-provider-SDOL6IWH.js 9.12 kB +9.12 kB (new file) 🆕
ℹ️ View Unchanged
Filename Size Change
./bundle/bundled/third_party/index.js 8 MB 0 B
./bundle/chunk-34MYV7JD.js 2.45 kB 0 B
./bundle/chunk-5AUYMPVF.js 858 B 0 B
./bundle/chunk-5PS3AYFU.js 1.18 kB 0 B
./bundle/chunk-6HI7VNOG.js 124 kB 0 B
./bundle/chunk-DAHVX5MI.js 206 kB 0 B
./bundle/chunk-IUUIT4SU.js 56.5 kB 0 B
./bundle/chunk-TUDYL3X4.js 40.3 kB 0 B
./bundle/cleanup-FIHIBBEC.js 0 B -902 B (removed) 🏆
./bundle/devtools-V7NE4CQA.js 696 kB 0 B
./bundle/events-XB7DADIJ.js 418 B 0 B
./bundle/examples/hooks/scripts/on-start.js 188 B 0 B
./bundle/examples/mcp-server/example.js 1.43 kB 0 B
./bundle/gemini.js 5.35 kB +278 B (+5.48%) 🔍
./bundle/getMachineId-bsd-TXG52NKR.js 1.55 kB 0 B
./bundle/getMachineId-darwin-7OE4DDZ6.js 1.55 kB 0 B
./bundle/getMachineId-linux-SHIFKOOX.js 1.34 kB 0 B
./bundle/getMachineId-unsupported-5U5DOEYY.js 1.06 kB 0 B
./bundle/getMachineId-win-6KLLGOI4.js 1.72 kB 0 B
./bundle/https-proxy-agent-AVGR4LHR.js 490 B 0 B
./bundle/multipart-parser-KPBZEGQU.js 11.7 kB 0 B
./bundle/sandbox-macos-permissive-open.sb 890 B 0 B
./bundle/sandbox-macos-permissive-proxied.sb 1.31 kB 0 B
./bundle/sandbox-macos-restrictive-open.sb 3.36 kB 0 B
./bundle/sandbox-macos-restrictive-proxied.sb 3.56 kB 0 B
./bundle/sandbox-macos-strict-open.sb 4.82 kB 0 B
./bundle/sandbox-macos-strict-proxied.sb 5.02 kB 0 B
./bundle/src-LG4OHBW7.js 233 kB 0 B
./bundle/src-QVCVGIUX.js 47 kB 0 B
./bundle/start-M4YT4ZIC.js 0 B -622 B (removed) 🏆
./bundle/tree-sitter-7U6MW5PS.js 274 kB 0 B
./bundle/tree-sitter-bash-34ZGLXVX.js 1.84 MB 0 B
./bundle/worker/worker-entry.js 361 kB 0 B
./bundle/cleanup-ASN2NS4K.js 902 B +902 B (new file) 🆕
./bundle/start-VILWVLVB.js 622 B +622 B (new file) 🆕

compressed-size-action

@gemini-cli gemini-cli Bot added the status/need-issue Pull requests that need to have an associated issue. label May 28, 2026
@scidomino scidomino merged commit 73421e3 into release/v0.44.0-pr-27496 May 28, 2026
25 checks passed
@scidomino scidomino deleted the hotfix/v0.44.0/0.44.1/stable/cherry-pick-bd53951/pr-27496 branch May 28, 2026 16:52
@github-actions github-actions Bot mentioned this pull request Jun 1, 2026
Open
@github-actions github-actions Bot added the size/m A medium sized PR label Jun 2, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@scidomino scidomino scidomino approved these changes
+1 more reviewer
@gemini-code-assist gemini-code-assist[bot] gemini-code-assist[bot] left review comments
Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

size/m A medium sized PR status/need-issue Pull requests that need to have an associated issue.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@gemini-cli-robot @scidomino